Merge "Make convertUserOptions.php more self-contained"